From 0a41106ac246d5e33950be4d26ddcaee0ba4352e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 7 May 2004 03:55:39 +0000 Subject: [PATCH] Merge from 2.4: Thu May 6 23:52:13 2004 Matthias Clasen Merge from 2.4: * gtk/gtkmenuitem.c (gtk_menu_item_select_timeout): Also popup the submenu for items in torn off menus. (#122051) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkmenuitem.c | 3 ++- 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 19f858a2be..281384463c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu May 6 23:52:13 2004 Matthias Clasen + + Merge from 2.4: + + * gtk/gtkmenuitem.c (gtk_menu_item_select_timeout): Also + popup the submenu for items in torn off menus. (#122051) + 2004-05-06 Sven Neumann * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 19f858a2be..281384463c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Thu May 6 23:52:13 2004 Matthias Clasen + + Merge from 2.4: + + * gtk/gtkmenuitem.c (gtk_menu_item_select_timeout): Also + popup the submenu for items in torn off menus. (#122051) + 2004-05-06 Sven Neumann * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 19f858a2be..281384463c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Thu May 6 23:52:13 2004 Matthias Clasen + + Merge from 2.4: + + * gtk/gtkmenuitem.c (gtk_menu_item_select_timeout): Also + popup the submenu for items in torn off menus. (#122051) + 2004-05-06 Sven Neumann * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 19f858a2be..281384463c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Thu May 6 23:52:13 2004 Matthias Clasen + + Merge from 2.4: + + * gtk/gtkmenuitem.c (gtk_menu_item_select_timeout): Also + popup the submenu for items in torn off menus. (#122051) + 2004-05-06 Sven Neumann * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode, diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 9e1a62c675..039a6c5ef9 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -962,7 +962,8 @@ gtk_menu_item_select_timeout (gpointer data) parent = GTK_WIDGET (menu_item)->parent; - if (parent && GTK_IS_MENU_SHELL (parent) && GTK_MENU_SHELL (parent)->active) + if ((GTK_IS_MENU_SHELL (parent) && GTK_MENU_SHELL (parent)->active) || + (GTK_IS_MENU (parent) && GTK_MENU (parent)->torn_off)) { gtk_menu_item_popup_submenu (data); if (menu_item->timer_from_keypress && menu_item->submenu) -- 2.30.2